merge
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Wed, 25 Oct 2006 10:51:23 +0000 (11:51 +0100)
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Wed, 25 Oct 2006 10:51:23 +0000 (11:51 +0100)

Trivial merge